From: Jonas Dreßler <verdre@v0yd.nl>
Date: Thu, 21 Nov 2019 10:17:44 +0000 (+0700)
Subject: st/icon: Simplify property setting in set_gicon()
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~781^2^2~219
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c0fcf2d3a841dd0bb9c4b4cde526be6d5781fe61;p=gnome-shell.git

st/icon: Simplify property setting in set_gicon()

We can easily use `g_set_object()` to set the gicon property here.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/888
---

diff --git a/src/st/st-icon.c b/src/st/st-icon.c
index 133209d1e..0f9aa43d2 100644
--- a/src/st/st-icon.c
+++ b/src/st/st-icon.c
@@ -572,15 +572,7 @@ st_icon_set_gicon (StIcon *icon, GIcon *gicon)
   if (g_icon_equal (icon->priv->gicon, gicon)) /* do nothing */
     return;
 
-  if (icon->priv->gicon)
-    {
-      g_object_unref (icon->priv->gicon);
-      icon->priv->gicon = NULL;
-    }
-
-  if (gicon)
-    icon->priv->gicon = g_object_ref (gicon);
-
+  g_set_object (&icon->priv->gicon, gicon);
   g_object_notify_by_pspec (G_OBJECT (icon), props[PROP_GICON]);
 
   st_icon_update (icon);